Updates from current solution

The 'Updates from current solution' option of the Merge button (home > Solution > Merge) can be used when two people are working in the same DMS Solution simultaneously. If one user saves the solution, the other user will receive a notification (a thunderbolt appears on the merge icon on the strip and on the objects in the JewelExplorer).

This will enable the 'Updates from current solution' option. When clicked it will open the merge pane with all changes from the user that are new in that save.

The Merge Pane opens by default at the bottom of your view. The table in the pane is populated with all the objects that are in the solution you want to merge in the solution you are working in. Use the toolbar options at the top of the pane to perform the following actions:

	Automerge  Select this option to automatically merge all the changes that do not have conflicts into the solution you are working on.
	Merge  Select one object or multiple objects in the table. Next, click the merge icon to move the selected object(s) to the solution you are working on.
	Discard  Select one object or multiple objects in the table. Next, click the discard icon to remove the objects from the table without merging them into the solution you are working on.
	Copy Copy can be used just when you multiselect objects. The selected objects are moved into a copy of the objects. This option is only available if the object is already in the solution you want to merge data in.
	Audit Trail   Audit trail can be used on 1 object at a time. Select 1 row and click this button, the history of the object that is going to be merged in is shown.